From 46346fb1afeef779c6946394dbe0c1db952e8462 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Tue, 17 May 2016 15:23:55 +0200 Subject: [PATCH] Dropped patches applied upstream. --- debian/patches/0001-reproducible.patch | 27 -------------------------- debian/patches/0002-spelling.patch | 15 -------------- debian/patches/0003-skip-tests.patch | 20 ------------------- debian/patches/series | 3 --- 4 files changed, 65 deletions(-) delete mode 100644 debian/patches/0001-reproducible.patch delete mode 100644 debian/patches/0002-spelling.patch delete mode 100644 debian/patches/0003-skip-tests.patch diff --git a/debian/patches/0001-reproducible.patch b/debian/patches/0001-reproducible.patch deleted file mode 100644 index 7d09c1f..0000000 --- a/debian/patches/0001-reproducible.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: allow setting of the displayed build-date - so we can make builds reproducible -Author: IOhannes m zmölnig ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- giada.orig/src/gui/dialogs/gd_about.cpp -+++ giada/src/gui/dialogs/gd_about.cpp -@@ -40,6 +40,10 @@ - - extern Conf G_Conf; - -+#ifndef BUILD_DATE -+# define BUILD_DATE __DATE__ -+#endif -+ - - gdAbout::gdAbout() - #ifdef WITH_VST -@@ -70,7 +74,7 @@ - char message[512]; - sprintf( - message, -- "Version " G_VERSION_STR " (" __DATE__ ")\n\n" -+ "Version " G_VERSION_STR " (" BUILD_DATE ")\n\n" - "Developed by Monocasual\n" - "Based on FLTK (%d.%d.%d), RtAudio (%s),\n" - "RtMidi (%s), libsamplerate, Jansson (%s) \n" diff --git a/debian/patches/0002-spelling.patch b/debian/patches/0002-spelling.patch deleted file mode 100644 index cdb6807..0000000 --- a/debian/patches/0002-spelling.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix small misspellings. -Author: Jaromír Mikeš -Forwarded: giadaloopmachine@gmail.com - ---- giada.orig/src/core/kernelMidi.cpp -+++ giada/src/core/kernelMidi.cpp -@@ -271,7 +271,7 @@ - * messages) as unknown, for debugging purposes */ - - if (msg->size() < 3) { -- gLog("[KM] MIDI received - unkown signal - size=%d, value=0x", (int) msg->size()); -+ gLog("[KM] MIDI received - unknown signal - size=%d, value=0x", (int) msg->size()); - for (unsigned i=0; isize(); i++) - gLog("%X", (int) msg->at(i)); - gLog("\n"); diff --git a/debian/patches/0003-skip-tests.patch b/debian/patches/0003-skip-tests.patch deleted file mode 100644 index df67229..0000000 --- a/debian/patches/0003-skip-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: skip tests that cannot succeed - wave-test: requires non-existing (non-shipped) test.wav - midimap-test: requires midimaps to be installed in the user's home directory -Author: IOhannes m zmölnig -Bug: https://github.com/monocasual/giada/issues/69 -Last-Update: 2016-02-16 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- giada.orig/Makefile.am -+++ giada/Makefile.am -@@ -180,9 +180,7 @@ - giada_tests_SOURCES = \ - tests/main.cpp \ - tests/conf.cpp \ --tests/wave.cpp \ - tests/patch.cpp \ --tests/midiMapConf.cpp \ - tests/utils.cpp \ - src/core/conf.cpp \ - src/core/wave.cpp \ diff --git a/debian/patches/series b/debian/patches/series index 0effaeb..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +0,0 @@ -0001-reproducible.patch -0002-spelling.patch -0003-skip-tests.patch -- 2.30.2